Skip to content

Update suse15 packaging spec, use qemu-ovmf-x86_64 package instead of edk2-ovmf for agent#13133

Merged
sureshanaparti merged 7 commits into
apache:4.22from
shapeblue:suse15-packaging-spec-update
May 11, 2026
Merged

Update suse15 packaging spec, use qemu-ovmf-x86_64 package instead of edk2-ovmf for agent#13133
sureshanaparti merged 7 commits into
apache:4.22from
shapeblue:suse15-packaging-spec-update

Conversation

@sureshanaparti
Copy link
Copy Markdown
Contributor

@sureshanaparti sureshanaparti commented May 8, 2026

Description

This PR update suse15 packaging spec, use qemu-ovmf-x86_64 package instead of edk2-ovmf for agent.

Fixes #13004

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (improves an existing feature and functionality)
  • Cleanup (Code refactoring and cleanup, that may add test cases)
  • Build/CI
  • Test (unit or integration test code)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

  • Major
  • Minor

Bug Severity

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

@sureshanaparti
Copy link
Copy Markdown
Contributor Author

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

@sureshanaparti a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

@codecov
Copy link
Copy Markdown

codecov Bot commented May 8, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 17.68%. Comparing base (ddcc0c8) to head (c86e64d).
⚠️ Report is 2 commits behind head on 4.22.

Additional details and impacted files
@@             Coverage Diff              @@
##               4.22   #13133      +/-   ##
============================================
- Coverage     17.68%   17.68%   -0.01%     
+ Complexity    15794    15792       -2     
============================================
  Files          5922     5922              
  Lines        533095   533123      +28     
  Branches      65208    65201       -7     
============================================
- Hits          94281    94259      -22     
- Misses       428171   428220      +49     
- Partials      10643    10644       +1     
Flag Coverage Δ
uitests 3.69% <ø> (-0.01%) ⬇️
unittests 18.75% <ø> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@weizhouapache
Copy link
Copy Markdown
Member

@sureshanaparti
can we just update e8/cloud.spec instead of creating a new one ?

diff --git a/packaging/el8/cloud.spec b/packaging/el8/cloud.spec
index 3dee161bf27..13c0a36cb10 100644
--- a/packaging/el8/cloud.spec
+++ b/packaging/el8/cloud.spec
@@ -117,7 +117,7 @@ Requires: ipset
 Requires: perl
 Requires: rsync
 Requires: cifs-utils
-Requires: edk2-ovmf
+Requires: (edk2-ovmf or qemu-ovmf-x86_64)
 Requires: swtpm
 Requires: (python3-libvirt or python3-libvirt-python)
 Requires: (qemu-img or qemu-tools)

@sureshanaparti
Copy link
Copy Markdown
Contributor Author

@sureshanaparti can we just update e8/cloud.spec instead of creating a new one ?

diff --git a/packaging/el8/cloud.spec b/packaging/el8/cloud.spec
index 3dee161bf27..13c0a36cb10 100644
--- a/packaging/el8/cloud.spec
+++ b/packaging/el8/cloud.spec
@@ -117,7 +117,7 @@ Requires: ipset
 Requires: perl
 Requires: rsync
 Requires: cifs-utils
-Requires: edk2-ovmf
+Requires: (edk2-ovmf or qemu-ovmf-x86_64)
 Requires: swtpm
 Requires: (python3-libvirt or python3-libvirt-python)
 Requires: (qemu-img or qemu-tools)

ok @weizhouapache , let me check

@sureshanaparti
Copy link
Copy Markdown
Contributor Author

@weizhouapache is it good to have separate spec for suse? otherwise, we've to keep the updating el8 spec for suse variants with 'or'?

@blueorangutan
Copy link
Copy Markdown

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 17782

@sureshanaparti
Copy link
Copy Markdown
Contributor Author

@weizhouapache updated as advised, please check. thanks.

@sureshanaparti
Copy link
Copy Markdown
Contributor Author

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

@sureshanaparti a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

Copy link
Copy Markdown
Member

@weizhouapache weizhouapache left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

code lgtm

did not test it

@blueorangutan
Copy link
Copy Markdown

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 17783

@weizhouapache
Copy link
Copy Markdown
Member

@blueorangutan test suse15 kvm-suse15

@blueorangutan
Copy link
Copy Markdown

@weizhouapache a [SL] Trillian-Jenkins test job (suse15 mgmt + kvm-suse15) has been kicked to run smoke tests

@blueorangutan
Copy link
Copy Markdown

[SF] Trillian test result (tid-16056)
Environment: kvm-suse15 (x2), zone: Advanced Networking with Mgmt server s15
Total time taken: 53629 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr13133-t16056-kvm-suse15.zip
Smoke tests completed. 148 look OK, 1 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test Result Time (s) Test File
test_01_deploy_vm_from_iso_uefi_secure Error 54.61 test_deploy_vm_iso_uefi.py
test_02_deploy_vm_from_iso_uefi_legacy Error 12.63 test_deploy_vm_iso_uefi.py
test_03_deploy_windows_vm_from_iso_uefi_legacy Error 11.53 test_deploy_vm_iso_uefi.py
test_04_deploy_windows_vm_from_iso_uefi_secure Error 12.56 test_deploy_vm_iso_uefi.py

Copy link
Copy Markdown
Contributor

@rajujith rajujith left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
Tested.
The error ' nothing provides 'edk2-ovmf' is not seens anymore for cloudstack-agent installation on openSUSE 15.6

@weizhouapache
Copy link
Copy Markdown
Member

[SF] Trillian test result (tid-16056) Environment: kvm-suse15 (x2), zone: Advanced Networking with Mgmt server s15 Total time taken: 53629 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr13133-t16056-kvm-suse15.zip Smoke tests completed. 148 look OK, 1 have errors, 0 did not run Only failed and skipped tests results shown below:

Test Result Time (s) Test File
test_01_deploy_vm_from_iso_uefi_secure Error 54.61 test_deploy_vm_iso_uefi.py
test_02_deploy_vm_from_iso_uefi_legacy Error 12.63 test_deploy_vm_iso_uefi.py
test_03_deploy_windows_vm_from_iso_uefi_legacy Error 11.53 test_deploy_vm_iso_uefi.py
test_04_deploy_windows_vm_from_iso_uefi_secure Error 12.56 test_deploy_vm_iso_uefi.py

@sureshanaparti
could you check these test failures ?

@sureshanaparti
Copy link
Copy Markdown
Contributor Author

sureshanaparti commented May 10, 2026

[SF] Trillian test result (tid-16056) Environment: kvm-suse15 (x2), zone: Advanced Networking with Mgmt server s15 Total time taken: 53629 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr13133-t16056-kvm-suse15.zip Smoke tests completed. 148 look OK, 1 have errors, 0 did not run Only failed and skipped tests results shown below:
Test Result Time (s) Test File
test_01_deploy_vm_from_iso_uefi_secure Error 54.61 test_deploy_vm_iso_uefi.py
test_02_deploy_vm_from_iso_uefi_legacy Error 12.63 test_deploy_vm_iso_uefi.py
test_03_deploy_windows_vm_from_iso_uefi_legacy Error 11.53 test_deploy_vm_iso_uefi.py
test_04_deploy_windows_vm_from_iso_uefi_secure Error 12.56 test_deploy_vm_iso_uefi.py

@sureshanaparti could you check these test failures ?

@weizhouapache Noticed errors - "Failed to open file '/usr/share/edk2/ovmf/OVMF_VARS.secboot.fd", "Failed to open file '/usr/share/edk2/ovmf/OVMF_VARS.fd"

It seems the UEFI files are now different for suse (https://documentation.suse.com/sles/15-SP6/html/SLES-all/cha-kvm-inst.html#cha-kvm-inst-virtman-advanced-uefi). I've updated the new UEFI files in a separate properties file for suse.

/usr/share/edk2/ovmf/OVMF_VARS.fd -> /usr/share/qemu/ovmf-x86_64-vars.bin
/usr/share/edk2/ovmf/OVMF_CODE.cc.fd -> /usr/share/qemu/ovmf-x86_64-code.bin
/usr/share/edk2/ovmf/OVMF_VARS.secboot.fd -> /usr/share/qemu/ovmf-x86_64-ms-vars.bin
/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd -> /usr/share/qemu/ovmf-x86_64-ms-code.bin

@sureshanaparti
Copy link
Copy Markdown
Contributor Author

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

@sureshanaparti a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

@blueorangutan
Copy link
Copy Markdown

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 17804

@sureshanaparti
Copy link
Copy Markdown
Contributor Author

@blueorangutan test suse15 kvm-suse15

@blueorangutan
Copy link
Copy Markdown

@sureshanaparti a [SL] Trillian-Jenkins test job (suse15 mgmt + kvm-suse15) has been kicked to run smoke tests

@sureshanaparti
Copy link
Copy Markdown
Contributor Author

[SF] Trillian test result (tid-16056) Environment: kvm-suse15 (x2), zone: Advanced Networking with Mgmt server s15 Total time taken: 53629 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr13133-t16056-kvm-suse15.zip Smoke tests completed. 148 look OK, 1 have errors, 0 did not run Only failed and skipped tests results shown below:

Test Result Time (s) Test File
test_01_deploy_vm_from_iso_uefi_secure Error 54.61 test_deploy_vm_iso_uefi.py
test_02_deploy_vm_from_iso_uefi_legacy Error 12.63 test_deploy_vm_iso_uefi.py
test_03_deploy_windows_vm_from_iso_uefi_legacy Error 11.53 test_deploy_vm_iso_uefi.py
test_04_deploy_windows_vm_from_iso_uefi_secure Error 12.56 test_deploy_vm_iso_uefi.py

manually verified the tests with latest changes.

[root@pr13133-t16063-kvm-suse15-marvin ~]# cat /marvin//MarvinLogs/test_deploy_vm_iso_uefi_23DOJU/results.txt 
Test Deploy CentOS Virtual Machine from ISO with UEFI Secure ... === TestName: test_01_deploy_vm_from_iso_uefi_secure | Status : SUCCESS ===
ok
Test Deploy CentOS Virtual Machine from ISO with UEFI Legacy mode ... === TestName: test_02_deploy_vm_from_iso_uefi_legacy | Status : SUCCESS ===
ok
Test Deploy Windows Virtual Machine from ISO with UEFI Legacy mode ... === TestName: test_03_deploy_windows_vm_from_iso_uefi_legacy | Status : SUCCESS ===
ok
Test Deploy Windows Virtual Machine from ISO with UEFI Secure mode ... === TestName: test_04_deploy_windows_vm_from_iso_uefi_secure | Status : SUCCESS ===
ok

----------------------------------------------------------------------
Ran 4 tests in 149.052s

@sureshanaparti sureshanaparti merged commit a289bb0 into apache:4.22 May 11, 2026
24 of 26 checks passed
@github-project-automation github-project-automation Bot moved this from In Progress to Done in Apache CloudStack 4.22.1 May 11, 2026
@sureshanaparti sureshanaparti deleted the suse15-packaging-spec-update branch May 11, 2026 14:45
@blueorangutan
Copy link
Copy Markdown

[SF] Trillian test result (tid-16063)
Environment: kvm-suse15 (x2), zone: Advanced Networking with Mgmt server s15
Total time taken: 66507 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr13133-t16063-kvm-suse15.zip
Smoke tests completed. 135 look OK, 6 have errors, 8 did not run
Only failed and skipped tests results shown below:

Test Result Time (s) Test File
test_vm_backup_create_vm_from_backup Failure 607.88 test_backup_recovery_nas.py
test_vm_backup_lifecycle Error 1.09 test_backup_recovery_nas.py
test_01_deploy_vm_from_iso_uefi_secure Error 64.83 test_deploy_vm_iso_uefi.py
test_02_deploy_vm_from_iso_uefi_legacy Error 14.49 test_deploy_vm_iso_uefi.py
test_03_deploy_windows_vm_from_iso_uefi_legacy Error 13.47 test_deploy_vm_iso_uefi.py
test_04_deploy_windows_vm_from_iso_uefi_secure Error 15.48 test_deploy_vm_iso_uefi.py
ContextSuite context=TestSharedFSLifecycle>:setup Error 0.00 test_sharedfs_lifecycle.py
test_10_attachAndDetach_iso Failure 607.11 test_vm_life_cycle.py
test_01_create_vm_snapshots Failure 610.81 test_vm_snapshots.py
test_02_revert_vm_snapshots Failure 600.73 test_vm_snapshots.py
test_03_delete_vm_snapshots Failure 0.02 test_vm_snapshots.py
test_01_create_volume Failure 611.12 test_volumes.py
test_01_root_volume_encryption Failure 702.43 test_volumes.py
test_02_data_volume_encryption Failure 646.67 test_volumes.py
test_03_root_and_data_volume_encryption Failure 662.38 test_volumes.py
test_02_attach_volume Failure 1272.87 test_volumes.py
test_02_attach_volume Failure 1272.89 test_volumes.py
test_03_download_attached_volume Failure 669.23 test_volumes.py
test_04_delete_attached_volume Failure 664.98 test_volumes.py
test_05_detach_volume Failure 755.13 test_volumes.py
test_06_download_detached_volume Failure 871.60 test_volumes.py
test_07_resize_fail Error 5.33 test_volumes.py
test_08_resize_volume Error 13.59 test_volumes.py
test_08_resize_volume Error 13.59 test_volumes.py
test_09_delete_detached_volume Error 8.43 test_volumes.py
test_09_delete_detached_volume Error 8.43 test_volumes.py
test_10_list_volumes Error 3.19 test_volumes.py
test_11_attach_volume_with_unstarted_vm Error 0.01 test_volumes.py
test_11_attach_volume_with_unstarted_vm Error 0.01 test_volumes.py
test_12_resize_volume_with_only_size_parameter Error 0.01 test_volumes.py
test_12_resize_volume_with_only_size_parameter Error 0.01 test_volumes.py
test_13_migrate_volume_and_change_offering Error 0.01 test_volumes.py
test_13_migrate_volume_and_change_offering Error 0.01 test_volumes.py
test_14_delete_volume_delete_protection Error 0.01 test_volumes.py
test_14_delete_volume_delete_protection Error 0.01 test_volumes.py
ContextSuite context=TestVolumes>:teardown Error 0.02 test_volumes.py
all_test_vpc_ipv6 Skipped --- test_vpc_ipv6.py
all_test_vpc_redundant Skipped --- test_vpc_redundant.py
all_test_vpc_router_nics Skipped --- test_vpc_router_nics.py
all_test_vpc_vpn Skipped --- test_vpc_vpn.py
all_test_webhook_delivery Skipped --- test_webhook_delivery.py
all_test_webhook_lifecycle Skipped --- test_webhook_lifecycle.py
all_test_host_maintenance Skipped --- test_host_maintenance.py
all_test_hostha_kvm Skipped --- test_hostha_kvm.py

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

edk2-ovmf added as dependency for cloudstack-agent is not available on openSuse

4 participants